Fix commit 5f55c420471db9a05d145e140b3a7cdfc5bdba9f

Make gtk_menu_shell_activate static and don't use it
outside gtkmenushell.c

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 618ebab8bbb714003fde4a3d4095c036ebfc43d1..db2b58106c12695be5b03deb49ff14fc449a406c 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1848,8 +1848,6 @@ gtk_real_menu_item_activate_item (GtkMenuItem *menu_item)
         gtk_menu_shell_activate_item (menu_shell, widget, TRUE);
       else
         {
-          _gtk_menu_shell_activate (menu_shell);
-
           gtk_menu_shell_select_item (menu_shell, widget);
           _gtk_menu_item_popup_submenu (widget, FALSE);
 

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 1a5a097cf6499e45137ebff8bec630059ad15226..548bcaa809db51b60ca2a84a8d3cb116b8338f2c 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -628,8 +628,8 @@ gtk_menu_shell_realize (GtkWidget *widget)
   gtk_style_context_set_background (context, window);
 }
 
-void
-_gtk_menu_shell_activate (GtkMenuShell *menu_shell)
+static void
+gtk_menu_shell_activate (GtkMenuShell *menu_shell)
 {
   GtkMenuShellPrivate *priv = menu_shell->priv;
 
@@ -697,7 +697,7 @@ gtk_menu_shell_button_press (GtkWidget      *widget,
               gtk_widget_get_parent (menu_item) == widget &&
               menu_item != priv->active_menu_item)
             {
-              _gtk_menu_shell_activate (menu_shell);
+              gtk_menu_shell_activate (menu_shell);
               priv->button = event->button;
 
               if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)
@@ -1312,7 +1312,7 @@ gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell,
       return;
     }
 
-  _gtk_menu_shell_activate (menu_shell);
+  gtk_menu_shell_activate (menu_shell);
 
   priv->active_menu_item = menu_item;
   if (pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT)

diff --git a/gtk/gtkmenushellprivate.h b/gtk/gtkmenushellprivate.h
index 1c6ed00b920488b5421afe2e411947f6df4dde56..5c93b084e834f0323ba2e3fdb1ccc7f026ba5672 100644 (file)
--- a/gtk/gtkmenushellprivate.h
+++ b/gtk/gtkmenushellprivate.h
@@ -75,8 +75,6 @@ void       _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,
                                               gboolean      keyboard_mode);
 gboolean   _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);
 
-void       _gtk_menu_shell_activate          (GtkMenuShell *menu_shell);
-
 
 G_END_DECLS